From 3b5459241bc904f910f34f19a8e33627d7a255e4 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Fri, 5 May 2006 13:46:59 +0100 Subject: [PATCH] Fix IA64 transparent-virtualization issue (Xen may not be running). Signed-off-by: Tristan Gingold --- linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c index e0c05915a5..f7e5425507 100644 --- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c +++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_probe.c @@ -1069,6 +1069,11 @@ static int __init wait_for_devices(void) { unsigned long timeout = jiffies + 10*HZ; + if (xen_init() < 0) { + DPRINTK("failed"); + return -ENODEV; + } + while (time_before(jiffies, timeout)) { if (all_devices_ready()) return 0; -- 2.30.2